2001-09-09 Alexander Larsson <alla@lysator.liu.se>

	* gtk/gtkwidget.c (_gtk_widget_peek_colormap):
	Really return NULL if not set.
	(gtk_widget_init): Remove unused varaible.

diff --git a/ChangeLog b/ChangeLog
index 7134937cbf9395ca39be87076b151c9c9079b27d..fa272d508c087c135a5a606c1d309ea2d3cd11ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2001-09-09  Alexander Larsson  <alla@lysator.liu.se>
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
 
        * configure.in:
        Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7134937cbf9395ca39be87076b151c9c9079b27d..fa272d508c087c135a5a606c1d309ea2d3cd11ca 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,4 +1,10 @@
-2001-09-09  Alexander Larsson  <alla@lysator.liu.se>
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
 
        * configure.in:
        Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7134937cbf9395ca39be87076b151c9c9079b27d..fa272d508c087c135a5a606c1d309ea2d3cd11ca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,10 @@
-2001-09-09  Alexander Larsson  <alla@lysator.liu.se>
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
 
        * configure.in:
        Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7134937cbf9395ca39be87076b151c9c9079b27d..fa272d508c087c135a5a606c1d309ea2d3cd11ca 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,4 +1,10 @@
-2001-09-09  Alexander Larsson  <alla@lysator.liu.se>
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
 
        * configure.in:
        Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7134937cbf9395ca39be87076b151c9c9079b27d..fa272d508c087c135a5a606c1d309ea2d3cd11ca 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,4 +1,10 @@
-2001-09-09  Alexander Larsson  <alla@lysator.liu.se>
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
 
        * configure.in:
        Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7134937cbf9395ca39be87076b151c9c9079b27d..fa272d508c087c135a5a606c1d309ea2d3cd11ca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,10 @@
-2001-09-09  Alexander Larsson  <alla@lysator.liu.se>
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
 
        * configure.in:
        Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7134937cbf9395ca39be87076b151c9c9079b27d..fa272d508c087c135a5a606c1d309ea2d3cd11ca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,10 @@
-2001-09-09  Alexander Larsson  <alla@lysator.liu.se>
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
 
        * configure.in:
        Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2d731a7ccf9004add307c94160ef7d3bf2f285f0..460038f3622e1930129d152415203156d5d5e73f 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1229,8 +1229,6 @@ gtk_widget_get_property (GObject         *object,
 static void
 gtk_widget_init (GtkWidget *widget)
 {
-  GdkColormap *colormap;
-  
   GTK_PRIVATE_FLAGS (widget) = PRIVATE_GTK_CHILD_VISIBLE;
   widget->state = GTK_STATE_NORMAL;
   widget->saved_state = GTK_STATE_NORMAL;
@@ -5351,6 +5349,7 @@ _gtk_widget_peek_colormap (void)
 {
   if (colormap_stack)
     return (GdkColormap*) colormap_stack->data;
+  return NULL;
 }
 
 static void